ChangeLog merge fix
authorGlenn Morris <rgm@gnu.org>
Thu, 31 May 2012 20:06:04 +0000 (16:06 -0400)
committerGlenn Morris <rgm@gnu.org>
Thu, 31 May 2012 20:06:04 +0000 (16:06 -0400)
commit61d50afcc6cdfffb2a13af20701b6aa9aee97792
treeef94be364074443ccfd1a529eda65a9e13d20021
parent93fef9d8d4f26f6f12832dfe6ceb52ed4efddb0d
ChangeLog merge fix
lisp/ChangeLog